Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Dec 2011 15:50:49 +0000 (07:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Dec 2011 15:50:49 +0000 (07:50 -0800)
commitfaf4c4dccd7079fb0f18bfde4258d9c0e15f92ac
tree9f09de894da1d29c2ad3a643077e31f2cfa5517e
parent966739bbc5fd4f54d652a103b6abe99f8915f600
parent985c44b594ec9742e51b692794ca1748f050a17b
Merge from trunk.